Conversation
malfisya
left a comment
There was a problem hiding this comment.
Can you re-word the message on cpp-utilities commit. It is not descriptive enough at glance. Maybe something like "Remove foo rundeps and add optimize key" .
**Summary** - Removed unneeded rundeps (gcc + libstdc++) - Enabled clang and added speed + thin-lto optimise keys
bd2b484 to
1b33182
Compare
| source : | ||
| - https://github.com/Martchus/qtforkawesome/archive/refs/tags/v0.3.2.tar.gz : 9215162e9dd73eb64047de5f2a21c654ce8e6df2994ebe558b7fd7a31b28bb52 | ||
| homepage : https://github.com/Martchus/qtforkawesome | ||
| networking: true |
There was a problem hiding this comment.
Why does it need networking?
There was a problem hiding this comment.
Networking is required because it pulls in fonts from Fork-Awesome if they're not manually provided. Should I be providing them manually as extra files instead?
For more context: https://github.com/Martchus/qtforkawesome?tab=readme-ov-file#providing-the-font-file
There was a problem hiding this comment.
Hmm Yeah, I would like the project's source tarball added as a source, and then moved to the right place.
source :
- https://github.com/Martchus/qtforkawesome/archive/refs/tags/v0.3.2.tar.gz : 9215162e9dd73eb64047de5f2a21c654ce8e6df2994ebe558b7fd7a31b28bb52
- https://github.com/ForkAwesome/Fork-Awesome/archive/refs/tags/1.2.0.tar.gz#fork-awesome.tar.gz : whatever the sha256sum of the downloaded file issetup : |
mkdir forkawesome
tar -xf ${sources}/fork-awesome.tar.gz -C forkawesome
%cmake_ninja \
-DBUILD_SHARED_LIBS=ON \
-DQT_PACKAGE_PREFIX:STRING='Qt6' \
-DFORK_AWESOME_FONT_FILE='./forkawesome/fonts/forkawesome-webfont.woff2' \
-DFORK_AWESOME_ICON_DEFINITIONS='./src/icons/icons.yml'The licenses of the Fork-Awesome project should also be added to this package spec.
There was a problem hiding this comment.
So it took me an embarrasing amount of time to figure out that the reason the mkdir command wasn't being executed was because I didn't remove the | after setup :. After removing it, however, I'm getting mkdir: invalid option -- 'x'
I tried adding an empty line between mkdir and tar but that resulted in none of the cmake arguments going through.
There was a problem hiding this comment.
Ah so it seems like mkdir + tar are both being fired as one command from the terminal output. How do i split them into two seperate commands
There was a problem hiding this comment.
I think i've figured it out. The archive contains another folder with the version number attached to it. Adding that to the directory for the font file has fixed it
There was a problem hiding this comment.
Hrm so when I was playing around earlier, I didn't notice that everything is in another top-level directory. I hate our tooling's handling of multiple sources... Or the lack thereof....
Let's try this:
Set the paths being passed to CMake to start with ./forkawesome/Fork-Awesome-1.2.0/ instead of just ./forkawesome. I hate it, and it's ugly, but I'm not sure that I care enough to mess with it more.
There was a problem hiding this comment.
Lemme think overnight on this, actually. I'm not convinced this is the best way.
There was a problem hiding this comment.
Lemme think overnight on this, actually. I'm not convinced this is the best way.
any update on this?
There was a problem hiding this comment.
Sorry, I got very distracted by... Everything. Let's just add the individual files we need as sources. Make sure that they're being grabbed from a commit ref, and not the main branch. Then you can just copy them to the correct directory in the setup step without the jank of untarring.
| %ninja_install | ||
|
|
||
| # Install Licence | ||
| %install_license LICENSE |
There was a problem hiding this comment.
There's also LICENSE.LESSER and LICENSE.MPL-2.0 that should be included.
There was a problem hiding this comment.
I seemed to have missed that, my bad! I've added them now
There was a problem hiding this comment.
This will work, but they can all be added as one line :P
%install_license LICENSE*
There was a problem hiding this comment.
This will work, but they can all be added as one line :P
%install_license LICENSE*
Won't that also pull in "LICENSES-windows-distribution.md" which seems like it's specific to windows or does that not matter?
There was a problem hiding this comment.
Fair point. You can still add multiple files with the same macro call, though.
**Summary** Add qtutilities which is a dependency for syncthingtray getsolus#7361
**Summary** Add qtforkawesome which is a dependency for syncthingtray getsolus#7361
**Summary** Adds syncthingtray. Resolves getsolus#7361
1b33182 to
ea930e6
Compare
| source : | ||
| - https://github.com/Martchus/qtforkawesome/archive/refs/tags/v0.3.2.tar.gz : 9215162e9dd73eb64047de5f2a21c654ce8e6df2994ebe558b7fd7a31b28bb52 | ||
| homepage : https://github.com/Martchus/qtforkawesome | ||
| networking: true |
There was a problem hiding this comment.
Hmm Yeah, I would like the project's source tarball added as a source, and then moved to the right place.
source :
- https://github.com/Martchus/qtforkawesome/archive/refs/tags/v0.3.2.tar.gz : 9215162e9dd73eb64047de5f2a21c654ce8e6df2994ebe558b7fd7a31b28bb52
- https://github.com/ForkAwesome/Fork-Awesome/archive/refs/tags/1.2.0.tar.gz#fork-awesome.tar.gz : whatever the sha256sum of the downloaded file issetup : |
mkdir forkawesome
tar -xf ${sources}/fork-awesome.tar.gz -C forkawesome
%cmake_ninja \
-DBUILD_SHARED_LIBS=ON \
-DQT_PACKAGE_PREFIX:STRING='Qt6' \
-DFORK_AWESOME_FONT_FILE='./forkawesome/fonts/forkawesome-webfont.woff2' \
-DFORK_AWESOME_ICON_DEFINITIONS='./src/icons/icons.yml'The licenses of the Fork-Awesome project should also be added to this package spec.
Summary
Adds syncthingtray as well as all of it's dependencies.
Resolves #7361
Test Plan
Installed the package and went through the guided setup. Everything seems to be working as intended.
Checklist